-
Notifications
You must be signed in to change notification settings - Fork 3.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Cluster grenade refactor and contra markings #31108
Cluster grenade refactor and contra markings #31108
Conversation
this is currently possible on live: Base.Profile.2024.07.25.-.12.10.49.119.1.mp4 |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
I think the stinger hit the nukies boss |
# Conflicts: # Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For the love of god the original PR for this was almost 8 months ago, this bug has existed for a millennia at this post and nobody has reviewed this.
900 stingers in a single stinger grenade is probably capable of crashing a server |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for this! Just a few things from me
Also, during my tests I noted that when projectile grenades, like stingers, are triggered it causes a whole bunch of errors because the meta data component on the grenade can't be resolved. This is likely because it got deleted too early. So that needs to be addressed as well
Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
Outdated
Show resolved
Hide resolved
Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
Outdated
Show resolved
Hide resolved
Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
Outdated
Show resolved
Hide resolved
because the bullet considers the grenade shooting it the "gun" and the grenade gets deleted so there is technically no gun, yeah |
Are you able to fix it? All those errors cause noticeable lag |
I'm pretty sure this is the same as this bug already happening on master |
Yeah, it's the same issue |
2024-12-07.22-27-16.mp4 |
looks pretty good |
2024-12-07.23-01-31.mp4 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a few more things
Content.Shared/Explosion/EntitySystems/SharedScatteringGrenadeSystem.cs
Outdated
Show resolved
Hide resolved
Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
Outdated
Show resolved
Hide resolved
Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
Outdated
Show resolved
Hide resolved
Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
Outdated
Show resolved
Hide resolved
Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
Outdated
Show resolved
Hide resolved
Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
Outdated
Show resolved
Hide resolved
Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs
Outdated
Show resolved
Hide resolved
Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs
Outdated
Show resolved
Hide resolved
It doesn't look like the changes to RequireProjectileTargetSystem.cs have stopped the errors when projectile grenades detonate, unfortunately. I had a go at fixing it, but I couldn't make any progress either |
it stopped the client-side errors that normally caused me lag/game freezing at the very least but I never solved the gun code part that throws errors on the server |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good :)
I got a question, I've been attempting to make a grenade launcher that fires timed grenades in another server. Think this will help me out? |
that's exactly why I made this change, so I could make the china-lake fire different types of ammo like that lol |
THANK YOU. I can now give Delta's secborgs teargas and stingers instead of a pack injector |
So, I have gotten this PR of mine all working, except for 1 thing, the grenades launched by my launcher do not start the timer. How canI go abotu fixing that? |
* Cluster grenade refactor * oopsies on the name * Solve client-side errors * reviews addressed * filling scattering grenades is now predicted * reviews addressed
* Cluster grenade refactor and contra markings (space-wizards#31108) * Cluster grenade refactor * oopsies on the name * Solve client-side errors * reviews addressed * filling scattering grenades is now predicted * reviews addressed * Automatic changelog update * Wizard Mind Swap Spell (space-wizards#33416) * working mind swap spell * Removing unncessary spacing Co-authored-by: Thomas <[email protected]> * Changing mind swap speech Co-authored-by: keronshb <[email protected]> * All requested changes in review * Stores owned by mind instead of body * Requested changes, traitor uplink fixed * Revert "Requested changes, traitor uplink fixed" This reverts commit 2ceac67. * Revert "Stores owned by mind instead of body" This reverts commit dfb72ab. * Separate target and performer stun duration --------- Co-authored-by: Thomas <[email protected]> Co-authored-by: keronshb <[email protected]> * add SpawnTableOnUse (space-wizards#32620) * add SpawnTableOnUse * make BaseEmitSound more flexible and remove sound from spawntable * add log * --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * LightOnCollide entityquery (space-wizards#33886) * Add generator scrap (Plasma / uranium scrap) (space-wizards#32198) * First commit * Forgot the shading! * tweaked values * sprite update * Radiation * Add a test to check that lathe recipes are possible (space-wizards#33868) * Add a test to check that all lathes accept the materials for all their recipesy * Add check for storage limit * Track total recipe material volume * Check dynamic and emag recipes too * Move AllLatheRecipesValidTest from ResearchTest to LatheTest * Extremely minor modernization * Automatic changelog update * Fix udder wooly reagent creation V2 (space-wizards#32905) * Changed comments to be more clear and uniform. EggLayer uses NextGrowth instead of frame accumulation. Egglayer uses much less energy to make eggs, and lay time is randomized for player and AI chicken. * UdderComponent ReagentId can be changed now UdderSystem and WoolySystem use SharedSolutionContainerSystem now * Entities with udders can be examined to see a rough hunger level udders and wooly stop reagent generation/extra nutrient usage once the solution container is full * Moved stuff to Shared AutoPausedField now * Cleanup moving stuff to Shared * Oops. Make UdderSystem sealed instead of abstract. * Switch PopupEntity for PopupClient * Didn't mean to delete Access * new() instead of default! prototype revert egglayer balance change NextGrowth += timespan in egglayer * forgot [Datafield] for NextGrowth * forgot NetworkedComponent again... * Renaming Shared Animal to Shared Animals to match Server Hopefully also resolve merge conflicts. * Fix incorrect filename * Update with requested changes Put UdderSystem dependencies in alphabetical order. Initialise NextGrowth for Udder and Wooly components on MapInitEvent. Clean-up EggLayerSystem a little. Re-write OnExamine function for UdderSystem, improving clarity. Add full stops to end of udder examine locales. And more :) * Add some additional descriptions for cow hunger levels. * Add Udder and Wooly quantity to AutoNetworkedField * Account for less than starving threshold. --------- Co-authored-by: sirionaut <[email protected]> Co-authored-by: Sirionaut <[email protected]> Co-authored-by: Tayrtahn <[email protected]> * Automatic changelog update * Prevent pulling when teleporting (space-wizards#33252) * No more teleporting pulling * pulled dash * Update Content.Shared/Ninja/Systems/DashAbilitySystem.cs Co-authored-by: slarticodefast <[email protected]> * Update Content.Server/Implants/SubdermalImplantSystem.cs Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Add an in-hand sprite for the lizard plushie (space-wizards#32583) * add hold sprites for lizard plushie * make the lizard plushie sprites slightly chonkier for those who are not wearing winter clothes. * me when i hit the noise button and pretend it's shading. * lizard plushie is not legally-distinct green dinosaur with a long tongue™ (front sprite tongue has been shortened) * update meta.json * Automatic changelog update * Makes admins not count towards the playercount cap (space-wizards#33424) * Makes admins not count towards the playercount cap * Update Content.Shared/CCVar/CCVars.Admin.cs (thx Aeshus Co-authored-by: Thomas <[email protected]> * Actually fixes whitespace on the comments Thanks VScode very good IDE --------- Co-authored-by: Thomas <[email protected]> * Automatic changelog update * Add the Zombie, a new cocktail (space-wizards#32802) * Automatic changelog update * Add Holy damage (space-wizards#32755) * Initial commit * hoili moili * now to add sherlock and doctor who * funny stick * Oops it was meant to be called metaphysical * Attribution * Even BETTER attribution * Automatic changelog update * Add Explosion Resistance to SecBelts (space-wizards#33253) Added explosion resistance to secbelt * Automatic changelog update * Chem master UI (space-wizards#33328) * chemmaster buffer has colors now * I have saved chemists everywhere * implimented panelcontainers instead of labels, slight visual rework * added UI changes to input buffer * fixed some unsightly indentation on brackets and removed redundant minheight specification from verticalstretch elements * Formatting and code cleanup * pills still not rendering correctly * more tinkering, entities finally display correctly * entities display correctly, pill fields default to max now * fixed stripes * fixed excess pillCount bug * removed cache, fixed tab swapping --------- Co-authored-by: Saphire <[email protected]> * Spaceshroom grilling (space-wizards#31872) * make spaceshroom cookable on grill * remove microwave recipe * Automatic changelog update * Figures can now be activated remotely (space-wizards#32769) * First commit * I'm silly * weh * will this work? * Better design * Fixes! * rider :( * L rider * Automatic changelog update * Flora clean up (space-wizards#33839) * first migrate * clean up prototypes * Update polymorph.yml * Update flora.yml * and this one * and this one x2 * and this one x3 * Update migration.yml * Christmas anomaly (space-wizards#33889) * santa anomaly * Update anomaly.yml * injection * Update anomaly.yml * Update Resources/Locale/en-US/anomaly/inner_anomaly.ftl Co-authored-by: ScarKy0 <[email protected]> * Update Resources/Textures/Structures/Specific/Anomalies/Cores/santa_core.rsi/meta.json Co-authored-by: Errant <[email protected]> * Update Resources/Textures/Structures/Specific/Anomalies/santa_anom.rsi/meta.json Co-authored-by: Errant <[email protected]> --------- Co-authored-by: ScarKy0 <[email protected]> Co-authored-by: Errant <[email protected]> * Automatic changelog update * Atmospheric network monitor (space-wizards#32294) * Updated to latest master version * Added gas pipe analyzer * Completed prototype * Playing with UI display * Refinement of the main UI * Renamed gas pipe analyzer to gas pipe sensor * Added focus network highlighting and map icons for gas pipe sensors * Added construction graph for gas pipe sensor * Improved efficiency of atmos pipe and focus pipe network data storage * Added gas pipe sensor variants * Fixed gas pipe sensor nav map icon not highlighting on focus * Rendered pipe lines now get merged together * Set up appearance handling for the gas pipe sensor, but setting the layers is bugged * Gas pipe sensor lights turn off when the device is unpowered * Renamed console * The gas pipe sensor is now a pipe. Redistributed components between it and its assembly * AtmosMonitors can now optionally monitor their internal pipe network instead of the surrounding atmosphere * Massive code clean up * Added delta states to handle pipe net updates, fixed entity deletion handling * Nav map blip data has been replaced with prototypes * Nav map blip fixes * Nav map colors are now set by the console component * Made the nav map more responsive to changes in focus * Updated nav map icons * Reverted unnecessary namespace changes * Code tidy up * Updated sprites and construction graph for gas pipe sensor * Updated localization files * Misc bug fixes * Added missing comment * Fixed issue with the circuit board for the monitor * Embellished the background of the console network entries * Updated console to account for PR space-wizards#32273 * Removed gas pipe sensor * Fixing merge conflict * Update * Addressing reviews part 1 * Addressing review part 2 * Addressing reviews part 3 * Removed unnecessary references * Side panel values will be grayed out if there is no gas present in the pipe network * Declaring colors at the start of some files * Added a colored stripe to the side of the atmos network entries * Fixed an issue with pipe sensor blip coloration * Fixed delay that occurs when toggling gas sensors on/off * Automatic changelog update * Amber station updates (space-wizards#33899) * Fixed various issued identified during playtests. * Fixed a firelock stuck closed * Added more cameras and moved others * Fixed an issue with disposals * Modified the map a bit after watching some matches and listening to feedback * Reworked sec some more. Moved perma out into its own separate ship (another design from Frontier) Also performed various improvements to the station. * Added final touches, ready to PR * Added some more loot rooms throughout the map * Changed up some areas in maints that I didn't like * Removed footprints outside detective's room and wrenched down the logic gates in the ship building airlock * I totally didn't forget to add the lights * Gate map (space-wizards#32032) * import * remove perma asteroid * remove cyrillic * ok * Remove Chromite island, Move AI, add cameras * remove mapped garbage * add station anchors * admeme teleporter * remove wapr points, add nav beacons * telecomm, camera servers, some atmos fix * crew server * remove white plating, fix MANY pipestacking * playtest bugs fixing * big update * bunch minor fixes * Update gate.yml * out of rotation * Automatic changelog update * Zombies keep their anomalies on zombification (space-wizards#33867) * Zombies keep their anomalies on zombification * Refactor anombies to isolate anomalies and zombies InnerBodyAnomalies now send an event when the host dies. Zombies cancels this event if the host is turning into a zombie. * Anomazombies: deprecate CancellableEntityEventArgs CancellableEntityEventArgs is deprecated. Use structs with bool Cancelled instead. * Automatic changelog update * Anomaly Scanner In-hand Sprites (space-wizards#33427) * Adds in-hand sprites to the Anomaly Scanner. * Revert "Adds in-hand sprites to the Anomaly Scanner." This reverts commit 257efd0. im very stupid and need to undo my dumb commit. * okay actually making sure these are committed this time like a smart boi * Better version of the sprites based off of /tg station's health analyzer. * Updated copyright to include link to sprite * Updated copyright license and commit link * Update Resources/Textures/Objects/Specific/Research/anomalyscanner.rsi/meta.json Co-authored-by: Thomas <[email protected]> * Update Resources/Textures/Objects/Specific/Research/anomalyscanner.rsi/meta.json Aeshus adjusted indentation to better match original file. Co-authored-by: Thomas <[email protected]> --------- Co-authored-by: Thomas <[email protected]> * Automatic changelog update * HOTFIX: Add [MRP] tag to the hostname for Salamander (space-wizards#33909) * Oasis - remove vox box (space-wizards#33912) remove oasis vox box * Core - remove vox box (space-wizards#33911) remove Core vox box * Holopads (space-wizards#32711) * Initial resources commit * Initial code commit * Added additional resources * Continuing to build holopad and telephone systems * Added hologram shader * Added hologram system and entity * Holo calls now have a hologram of the user appear on them * Initial implementation of holopads transmitting nearby chatter * Added support for linking across multiple telephones/holopads/entities * Fixed a bunch of bugs * Tried simplifying holopad entity dependence, added support for mid-call user switching * Replaced PVS expansion with manually networked sprite states * Adjusted volume of ring tone * Added machine board * Minor features and tweaks * Resolving merge conflict * Recommit audio attributions * Telephone chat adjustments * Added support for AI interactions with holopads * Building the holopad UI * Holopad UI finished * Further UI tweaks * Station AI can hear local chatter when being projected from a holopad * Minor bug fixes * Added wire panels to holopads * Basic broadcasting * Start of emergency broadcasting code * Fixing issues with broadcasting * More work on emergency broadcasting * Updated holopad visuals * Added cooldown text to emergency broadcast and control lock out screen * Code clean up * Fixed issue with timing * Broadcasting now requires command access * Fixed some bugs * Added multiple holopad prototypes with different ranges * The AI no longer requires power to interact with holopads * Fixed some additional issues * Addressing more issues * Added emote support for holograms * Changed the broadcast lockout durations to their proper values * Added AI vision wire to holopads * Bug fixes * AI vision and interaction wires can be added to the same wire panel * Fixed error * More bug fixes * Fixed test fail * Embellished the emergency call lock out window * Holopads play borg sounds when speaking * Borg and AI names are listed as the caller ID on the holopad * Borg chassis can now be seen on holopad holograms * Holopad returns to a machine frame when badly damaged * Clarified some text * Fix merge conflict * Fixed merge conflict * Fixing merge conflict * Fixing merge conflict * Fixing merge conflict * Offset menu on open * AI can alt click on holopads to activate the projector * Bug fixes for intellicard interactions * Fixed speech issue with intellicards * The UI automatically opens for the AI when it alt-clicks on the holopad * Simplified shader math * Telephones will auto hang up 60 seconds after the last person on a call stops speaking * Added better support for AI requests when multiple AI cores are on the station * The call controls pop up for the AI when they accept a summons from a holopad * Compatibility mode fix for the hologram shader * Further shader fixes for compatibility mode * File clean up * More cleaning up * Removed access requirements from quantum holopads so they can used by nukies * The title of the holopad window now reflects the name of the device * Linked telephones will lose their connection if both move out of range of each other * Automatic changelog update * Test can now run on stable prs (space-wizards#33914) Make tests also run on stable and staging * Fix horrible lag in Zombies mode (space-wizards#33818) * Gate map: Holopads added (space-wizards#33918) Update gate.yml * Holopads + Atmos Network Console for Bagel (space-wizards#33921) Holopads! * Update PR size labeler line counts (space-wizards#33915) new numbers * Fix AME power generation (space-wizards#32825) * Change AME power generation * Fix negative power, change formula slightly * Automatic changelog update * Adds Advanced SMES, an SMES with higher capacity for mapping (space-wizards#33757) * Adds Advanced SMES machine and board to autolathe roundstart * Make Advanced SMES T2 Advanced Powercells research, reduce cost, remove from random spawner, add sprites by augustsun * fix attribution formatting * Update smes.yml to address review Co-authored-by: ScarKy0 <[email protected]> * add new sprites and change naming scheme, testing something * address review, tested it a bit more, works ingame --------- Co-authored-by: ScarKy0 <[email protected]> * Automatic changelog update * Ground Light Post Crafting Description Fix (space-wizards#33920) Updates ground light post's crafting description * Fix admins not being able to health scan slimes (space-wizards#33884) * Automatic changelog update * Amber Station - Added Holopads, Atmos Monitoring, and Advanced SMESes (space-wizards#33923) * Added holopads and atmos network monitoring. * Added the advanced SMESes to the station and evac shuttle * Removed an accidentally mapped vox air alarm * Fixed invalids in the escape shuttle * Bagel Power Rebalance + Gas Pipe Sensors (space-wizards#33925) * Balances bagel power * Adds gas pipe sensors * remove invalids :) * Omega Update (Holopads & Engi Stuff) (space-wizards#33926) Omega Update Add holopads, atmospheric network monitors & sensors, and advanced SMES's. * Box Power Rebalance + Holopads, Gas Pipe Sensors (space-wizards#33929) * fix power * Rebalance power, add holopads, add pipenet sensors * recolor that one pipe I missed + remove invalids * resave map, if this fails tests one more time, no more cake * Cargo Shuttle/ATS Update (space-wizards#33927) Update Cargo Shuttle/ATS Adds holopads to the cargo shuttle and ATS. Also replaces the blast door buttons on the cargo shuttle with locked variants. * Cog Power Rebalance + Holopads, Gas Pipe Sensors (space-wizards#33930) * fix cog power * double fix cog power * trial 3 * fourth go * i stopped counting * Fland Power Rebalance + Gas Pipe Sensors (space-wizards#33933) fix fland power * Make safes craftable (space-wizards#32694) * Made the Armory Gun Safe craftable with 10 steel, 10 plasteel, and 5 LV cables. * Changed gun safe price to 335, to match the cost of its material components. Changed gun safe to start with no accesses when constructed. * adress the review * yeah * wrah * test fail is not real --------- Co-authored-by: Ty Ashley <[email protected]> * Automatic changelog update * Holopad prototypes for mapping (space-wizards#33931) * Init * fix * Atmosn't * ID fixes * locale * Reduce network burden of the hunger system (space-wizards#32986) * reduce network burden of the hunger system * explicit start + last updated * remove auto reformat changes to otherwise untouched code add clamp helper * imagine making breaking changes, documenting them, and then not thinking to check the yaml * comments * Remove unused net manager in hunger system Remove lastAuthoritativeHungerValue from prototypes * Only disable panicbunker for admins with AdminFlags.Admin (space-wizards#33879) * Only disable panicbunker for admins with AdminFlags.Admin * nicer curly braces * Automatic changelog update * Fix hugging buckled mobs instead of unbuckling (space-wizards#33635) * Check buckle.BuckledTo value before hugging interaction * Make InteractHandEvent to be used by BuckleSystem before InteractionPopupSystem instead of after * Automatic changelog update * Replace Cellular Slime mob damage with Caustic (space-wizards#33104) Cellular gone * Automatic changelog update * Mercenary gear contraband tweaks. (space-wizards#33647) * Mercenary gear contraband tweaks. * Fixed Mercenary Combat Gloves to have basic Combat Gloves as a parent again. * Update Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml --------- Co-authored-by: RedBookcase <[email protected]> Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Sprite Movement working with AI movement (space-wizards#33494) * FINALLY * Update animals.yml * New Drazil plushie (inverse lizard plushie) (space-wizards#33776) * Hew * properly attribute hew.ogg * add to maints locker plushie pool with low chance, clear up grammar * shhhh nobody saw that linter failure * adds localization support for Weh and Hew emotes * fix capitalization error present since circa 2/25/2024 * resolve conflicts, fix sprite, add reversed inhands * clear up cursed formatting * Automatic changelog update * Localized holopads for Cog (space-wizards#33937) * coggers * Requested changes * Marathon Power Rebalance + Gas Pipe Sensors, Holopads (space-wizards#33938) * fix marathon power * add holopads * add requested changes * Localized holopads for Bagel (space-wizards#33934) * Stuff * Requested changes * Packed Update (Holopads & Engi Stuff) (space-wizards#33940) Packed Holopad & Engi Update Added holopads, atmos network monitor and sensors, advanced SMES, and revamped TEG setup. * Localized holopads + atmos network for Oasis (space-wizards#33941) Oasis stuff * Reach/Cargo Update (Holopads & Atmos) (space-wizards#33943) * Reach/Cargo Update Adds holopads and new atmos tech to Reach, and replaces cargo shuttle/ATS holopads with localized versions. * Fix Invalid invalidinvalidinvalidinvalidinvalidinvalid * [Christmas] Y'all want a Smite Cranberry? (space-wizards#33922) * Add a festive lemon-lime soda variant: cranberry! * Gave lemon-lime a brand name * Make the CrateFoodSoftdrinksLarge slightly larger to accomodate the extra drinks. * Extend the Christmas anomaly with extra jolliness * Minor spelling mistake. Jollyness will not be denied. * Removed redundant delay from meta file * Automatic changelog update * Comment LogTypes (space-wizards#33497) * Comment LogTypes * Uncomment unused types --------- Co-authored-by: Winkarst <[email protected]> * Show battery level for selected devices in Power Monitoring Console (space-wizards#33854) * Use class instead of out variables * Show battery level in power monitoring console * Better color contrast for battery level + localized string * Add visualization to battery percentage * Reverts random ChatSystem.cs whitespace change * Address review * Show BatteryLevel stats in child view when selecting devices --------- Co-authored-by: Crotalus <[email protected]> * Automatic changelog update * Omega Update (Localized Holopads) (space-wizards#33946) * Omega Update (Localized Holopads) Replaced all holopads with localized versions and a couple tiny misc * Remove engi protolathe * Forgot to rename engi fax whoops * Amber Statio - Localized Holopads and Balance Updates (space-wizards#33948) * Added loc versions of holopads to Amber, and made some adjustments given Acorn's feedback * fixed the name of the gameroom * Fixed it in the map file * Meta Power Rebalance + Gas Pipe Sensors, Holopads (space-wizards#33949) power fixes, sensors, dim lights * Packed Power Rebalance + Gas Sensors Adjustments (space-wizards#33955) * fix packed power * fix that * fix that as well * even more fixes * fix power, again * Omega Power Rebalance (space-wizards#33956) * fix packed power * Revert "fix packed power" This reverts commit 4f44d06. * fic the entire thing again * New mid pop station: Loop (space-wizards#33697) * many changes * contentingregrationtests * serialized invalid removed * blank * "Changes and fixes as suggested" * blank * blank * added desk bells * engi rework rework rework * added gate to content integration * tweaks * aaa * bbb * added holopads * ccc * Update default.yml --------- Co-authored-by: Emisse <[email protected]> * Automatic changelog update * Food Container Size Increase (space-wizards#33842) * Stuff * hehe * moar. * Logic Gate Compatibility with Non-Logic Signals bugfix (space-wizards#33792) :) * Automatic changelog update * Remove plushie_lizard_mirrored.png (space-wizards#33855) * Remove plushie_lizard_mirrored.png * Remove from meta.json * Replace mirrored state from yml --------- Co-authored-by: LevitatingTree <None> * Tweaks for the holopad (space-wizards#33928) * Initial commit * AIs get a warning when trying to answer long distance calls * Better handling of ending telephone calls * Fixed issue with duplicated holopad window when an AI answers a summons * Changed how ranges are handled, added the bluespace holopad * Bug fixes * More bug fixes * More bug fixes * Update Resources/Prototypes/Entities/Structures/Machines/holopad.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Entities/Structures/Machines/holopad.yml Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]> * Fix: Update armor crate description (space-wizards#33414) Update armor crate * Automatic changelog update * Loopstation hotfix (space-wizards#33958) Co-authored-by: Emisse <[email protected]> * Update Fland for holopads (space-wizards#33962) * update fland for holopads * fix duplicate holopad name * Fixes/removes borg spawnpoint from Oasis Engineering, added one to Robotics (space-wizards#33960) removed borg spawnpoint from engineering, added one to robotics Co-authored-by: august-sun <[email protected]> * Update Credits (space-wizards#33865) Co-authored-by: PJBot <[email protected]> * Minor fixes for the holopad (space-wizards#33969) Initial commit * add man-o-war shuttle (space-wizards#32105) manowar * Add MovementSound (space-wizards#31313) Mainly useful for medicalborg so you can get a looping sound and not footsteps playing over and over. Didn't actually update medborg because footsteps need updating. Not needed for AI. * Remove Clearly Nuclear on Author's Request (space-wizards#33971) Revert "New Nukie Song (space-wizards#25765)" This reverts commit 806c0d1. * Automatic changelog update * Fix communication console menu (space-wizards#33655) fix Communication console * Automatic changelog update * combine licence files for StationEvents audio (space-wizards#33972) * merge licence files * actual commit * whoops * All hostile turret (space-wizards#33970) * All hostile turret * Other factions are now hostile against "all hostile" too * Automatic changelog update * Add clearer defib cooldowns! (space-wizards#31251) * First commit * Fix silly test * Swiched stuff up * Update Content.Shared/Medical/DefibrillatorComponent.cs * remove unneeded visuals --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Nanotrasen, Syndicate factions are now hostile to Dragons and Carps (space-wizards#32515) * Weh Weh * Now hostiles too! Added Dragon to hostile factions for Hostiles * Nah Better not do this, I think * Automatic changelog update * Add description of tool qualities to entity (space-wizards#32436) * Add description of tool qualities to entity * LMAO I FORGOT FUCKING FTL FILE * minor cleanup --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Diona chirping & Nymph vocals (space-wizards#32511) * Adds chirping to adult diona * Added vocals for diona nymph * Nymphs now have a speechsound * Automatic changelog update * Increase syndicate uplink discount amount to 6. (space-wizards#33950) * Increase uplink discounts from 3 to 7 * nevermind, 6 * Automatic changelog update * Wood walls from barricades (space-wizards#33902) * Wood wall is now built from barricade congraph and on top of a barricade instead of using rods * Fixed construction instructions for wooden wall * Wood wall is now built from barricade congraph and on top of a barricade instead of using rods * Fixed construction instructions for wooden wall * fixed linter error * Update Resources/Prototypes/Entities/Structures/Walls/walls.yml Reasonable suggestion Co-authored-by: Thomas <[email protected]> * Update Resources/Prototypes/Entities/Structures/Walls/walls.yml spelling error Co-authored-by: slarticodefast <[email protected]> * removed ability to build wall from 'junk' wood barrier' * fixed ability to pry overlay barricades and not allow them to extend to full wood walls * renamed incorrectly named entity * fixed default entity graph so as to not complain for unit tests * corrected my incorrect assumptions and fixed destroy cost --------- Co-authored-by: Thomas <[email protected]> Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Implement some field-level deltas (space-wizards#28242) * Update GasTileOverlayState * Update DecalGridState * Update NavMapState * poke * poke2 * poke3 * Implement field deltas for guns * Content done * Update --------- Co-authored-by: ElectroJr <[email protected]> * Update submodule to 237.4.0 (space-wizards#33976) * Toolshed refactor (space-wizards#33598) * Content changes for engine toolshed PR * add contains command * more permissive commands * Automatic changelog update * Update engine to v238.0.0 (space-wizards#33980) * Automatic changelog update * adjust eshotgun recharge delay (space-wizards#33996) * Specify privacy policy for Wizard's Den (space-wizards#34013) * Localized holopads for Box (space-wizards#34011) I love holopads * Train: fix problematic atmos setup (space-wizards#34018) fix atmos setup * silent footsteps for ninja (space-wizards#33280) * waow * nice suggestion * nullable sound * fix stuff --------- Co-authored-by: Ed <[email protected]> Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * minor fix to "silent footsteps for ninja" (space-wizards#34040) minor fix * Fix the sensor monitoring console (space-wizards#34035) Still isn't really suitable to just map but at least it doesn't outright NRE anymore. Alternative to space-wizards#34032 * Fix borgs being able to drink from buckets and spray bottles. (space-wizards#32964) * Added a check for if the entity trying to drink is a borg. * Fixed missing namespace issue. * Improved code conciseness. * Removed borg chassis check, added stomach check. * Removed unused namespace --------- Co-authored-by: dankeaj <[email protected]> * Automatic changelog update * Remove cog cargo protolathe (space-wizards#34026) * Removed protolathe from cargo on Amber * Removed protolathe from cargo on Cog * Revert "Removed protolathe from cargo on Amber" This reverts commit 422db6e. revert commit that should have been done on another branch * Removed protolathe from cargo on Amber (space-wizards#34027) * Automatic changelog update * Increases Marathon cryosleep size, added meteor shielding to Marathon chapelroid (space-wizards#34044) Increases Marathon cryosleep size, added meteor shielding to chapelroid Co-authored-by: august-sun <[email protected]> * Fix race condition causing disconnected admins to appear in adminwho (space-wizards#34033) * Adds more air alarms and sensors throughout Oasis, linked unlinked air devices (space-wizards#34046) Adds more air alarms and sensors throughout Oasis Co-authored-by: august-sun <[email protected]> * Multiple items in loadouts (space-wizards#33193) * loadouts update * Update loadout_groups.yml * darts to candles * Update Resources/Prototypes/Loadouts/dummy_entities.yml --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Add crazybrain23 to CODEOWNERS (space-wizards#34038) Add myself to CODEOWNERS Basically just added myself where Nik was since I am also doing headmin things. * Update Credits (space-wizards#33998) Co-authored-by: PJBot <[email protected]> * Allow to paint multiple airlocks (space-wizards#34001) * Allow to paint multiple airlocks * oh right * Automatic changelog update * Link Core cargo shuttle atmos devices (space-wizards#34061) * Link Core cargo shuttle atmos devices * Remove configurator lines This matches what the DeviceNetworks in core.yml look like now. Hopefully it works? * bagel update (space-wizards#34062) * bagel update * fixgridatmos * fdsafds * Loop Station update and fixes (space-wizards#34067) * many changes * contentingregrationtests * serialized invalid removed * blank * "Changes and fixes as suggested" * blank * blank * added desk bells * engi rework rework rework * added gate to content integration * tweaks * aaa * bbb * added holopads * ccc * Update default.yml * hotfix * aaa * bbb * many many tweaks and fixes * aaa --------- Co-authored-by: Emisse <[email protected]> * Amber Station - Fixed evac shuttle screens (space-wizards#34071) Added Devicenetwork component to ensure the screens work * bagel update (space-wizards#34073) * Reinforced tables require welding to construct/deconstruct (space-wizards#33992) * Automatic changelog update * Arrivals blacklist for bluespace lockers and QSIs (space-wizards#34072) * Ensure Arrivals Blacklist in Bluespace Locker rule * While I'm at it, stop the QSI too * fix thing I broke somehow * Every bluespace locker arrivals blacklisted * Add ArrivalsBlacklist to the prototypes too * Automatic changelog update * Fix popup on handcuffing for person being handcuffed (space-wizards#33639) * Fix popup on handcuffing for person being handcuffed * wrap onto newlines to appease the style gods * Automatic changelog update * Ignore audio entities in SpawnAndDeleteEntityCountTest (space-wizards#34021) * Fix wagging action name and desc (space-wizards#34089) * Removed Power Monitoring Computer boards from research and lathe recipes. Added default engineering sprites for atmos computer boards. (space-wizards#34078) * Defined sprites for Atmospheric Alerts and Monitoring computer boards. Added research unlocks and lathe recipes for them. * Defined default engineering sprite for atmospherics computer boards. Removed Power Monitoring Computer board from research and lathe recipes. * Defined engineering sprite for atmos computer boards. Removed Power Monitoring Computer board from research and lathe recipes. * Automatic changelog update * Traitor can no longer get multiple objectives to save/help/kill the same person (space-wizards#33704) * Deduplicate traitor objectives * Remove redundant check * Automatic changelog update * Removes weh.txt from Textures/Parallaxes (space-wizards#34097) Removes Unneeded File * UI improvements for holopads (space-wizards#34055) * Initial commit * Minor update * Automatic changelog update * Update Credits (space-wizards#34109) Co-authored-by: PJBot <[email protected]> * Added support so that smile can use hats (space-wizards#33924) * Added support so that smile can use hats Changed Prototypes/Entities/Mobs/NPCs/pets.yml Added smile_inventory_template.yml in Resources/Prototypes/inventoryTemplates Added dir smile_displacement.rsi inside Resources/Textures/Mobs/Pets/smile.rsi Added smile_displacement.rsi/meta.json Added smile_displacement.rsi/head.png * Fixed sprite path in ProtoTypes/Entities/Mobs/NPCs/pets.yml mapping to wrong smile_displacement.rsi Fixed smile_inventory_template.yml using uiWindowPos as 1,2 instead of 0,1 Moved Resources/Textures/Mobs/Pets/smile.rsi/ to .../Pets/smile/smile.rsi/ Moved Resources/Textures/Mobs/Pets/smile.rsi/smile_displacement.rsi to .../Pets/smile/smile_displacement.rsi * Minor fixes: removing comments and change naming Renamed Resources/Textures/Mobs/Pets/smile/smile.rsi To .../Mobs/Pets/Smile/smile.rsi * Removed smile_inventory_template.yml and used head_inventory_template.yml instead * Automatic changelog update * Add a guaranteed cotton pizza to pizza crates (space-wizards#33997) * add guaranteed cotton pizza to pizza crates * saner parenting * Use clearer suffix on cotton pizza box * Automatic changelog update * Corrected Cotton Dough Recipe (space-wizards#33988) * New cotton baguette, crostini, chevre-chaud, bagel, and croissant foods for moffs (space-wizards#33508) * A looooooooot of new cotton foods for the moffs * address slam's comments on the food for moffs not having any moff food in the food (the food that's intended for moffs) * alternative sprites for bagel-cottondough.png, baguette-cotton.png, and croissant-cotton.png * update requested sprites * change requested sprites * address part of sloth's review, awaiting response * address second half of review, fix magical food nutriment mitosis bug * Automatic changelog update * Rolling joints no longer requires a filter (space-wizards#34106) * Remove filters from joint crafting * err * hmmm * guhhh * yyyy * whitespace --------- Co-authored-by: Velcroboy <[email protected]> * Automatic changelog update * fix interdimensional teleporter desc (space-wizards#34108) Update hand_teleporter.yml * Adds kitchen/botany-locked maints airlock (space-wizards#34116) Co-authored-by: Velcroboy <[email protected]> * Added ID entry for captain on Bagel (space-wizards#34120) added id for captain Co-authored-by: dylanhunter <[email protected]> * Amber Station Overhaul (space-wizards#34113) * Step 01: Remade arrivals * Nearly finished, also added new beacons and a holopad * Wrapped up all changes, also added a beacon for the docking arm * Box Station - Dechristmassified (space-wizards#34135) * dechrismassified * removed camera from shower * Marathon Station - Dechristmassified (space-wizards#34136) * dechristmassified * further dechristmassified * Loop Station Decal and maints additions (space-wizards#34103) * many changes * contentingregrationtests * serialized invalid removed * blank * "Changes and fixes as suggested" * blank * blank * added desk bells * engi rework rework rework * added gate to content integration * tweaks * aaa * bbb * added holopads * ccc * Update default.yml * hotfix * aaa * bbb * many many tweaks and fixes * aaa * decals and maints * aaa * bbb * ccc --------- Co-authored-by: Emisse <[email protected]> * Rename cryobed yml file (space-wizards#34134) renamed cryopod.yml to cryogenic_sleep_unit.yml * Cog update (not very merry) (space-wizards#34144) removed christmas merry * bagel update (space-wizards#34145) * Add hair pulato (space-wizards#34117) * add sprite pulato * update * add pulato hair * add pulato hair * add pulato hair * update meta "pulato" * Automatic changelog update * Holopad UI tweak for incoming calls (space-wizards#34137) * Initial commit * Update * Comment correction * Minor margin increase * Holopads no longer log broadcasted speech and emotes in the chat (space-wizards#34114) Initial commit * Automatic changelog update * Fixes borgs not being able to check their laws in crit (space-wizards#34133) * fix * fix2 * Add contraband parent to laser gun safe (space-wizards#34132) * Automatic changelog update * Add Holopad Circuit Board to A/V Communication Technology (space-wizards#34150) Added the holopad circuit board to the AV Communication technology and circuit imprinter lathe. * Automatic changelog update * Fix disposal signal routers sprites (space-wizards#34139) * Fix disposal signal routers sprites * Remove old shitcode * Automatic changelog update * Meta station overhaul (space-wizards#33506) * added mail, moved some things around, and fixed a lot of APCs * fixed my mistakes * Fixed a few mistakes and AI camera names * Redid south medbay and more wiring * Finished sci overhaul, and fixed all issues that I could find. * rebuilt botany, removed vox box, fixed all known issues. * Overhauled security * Minor commit as I prepare to update my copy * Rebalanced role counts * Final changes, ready for review! * Emisse and other people fixed issues with the station * Finalized changes (for real this time)! * Standardize shotgun ammo in storagefills (space-wizards#34156) shotgun ammo changes * Automatic changelog update * meta update (space-wizards#34158) * Amber Station Adjustments (space-wizards#34126) * Made a couple fixes to various decals, cleaned up some entities, gave the clown their bag and the bartender a handlabeler * Several changes, more cameras, lighting fixes, adjusted hydro a bit, gave sec a bunch of shutters * Added new random spawners for science and added them to Amber * fixed the science spawners and modified amber slightly * Fixed the random instrument entry * Fix friendly vent spiders (space-wizards#34153) Swapped order of parents for MobGiantSpiderAngry * Removed UseDelay component from RCD (space-wizards#34149) * Automatic changelog update * Decrease hp for rusted walls (space-wizards#34043) * Automatic changelog update * FIX: Thief beacon doubled steal targets (space-wizards#33750) * Automatic changelog update * remove nukemass song (space-wizards#34066) * Automatic changelog update * Corrected all ghost role names to title case. (space-wizards#34155) * Corrected all ghost role names to title case. * Removes full stop from Hamlet's title. * Updated ghost role names not in the main ghost roles .ftl * Two capitals corrections * Packed Update (Remove Christmas & New Evac) (space-wizards#34168) * Packed update (remove christmas, new shuttle) * Fix invalid * the voices * Omega Update (Remove Christmas) (space-wizards#34174) omega soap * Renamed "Irish Car Bomb" drink to "Irish Slammer" (space-wizards#34107) * Renamed "Irish Car Bomb" drink to "Irish Slammer", due to concerns over insensitivity. * Fixing some missed references * Added prototype id changes to migration.yml. Removed any reference to the troubles (and corrected ale to stout for flavour text). * Corrected description back to "Irish Cream" * Removed non-entities from migration.yml * Automatic changelog update * Bugfix for the AI player's eye getting stuck when their broadcast is interrupted (space-wizards#34093) Initial commit * Speech is relayed by holopad holograms (space-wizards#33978) * Initial commit * Corrected a field attribute * Make JPEG a PNG (space-wizards#34176) Make 3.png a PNG * Removed Undesirable Ion Storm Verbs (space-wizards#34175) * Remove Undesirable Laws * empty * added basic admin logs for PDA notekeeper notes (space-wizards#34118) * added basic admin logs for PDA notekeeper notes * formatting * added new LogType 'PdaInteract' and changed PDA notekeeper logs to it --------- Co-authored-by: dylanhunter <[email protected]> * Automatic changelog update * Sprites defined for all non-generic computer boards. Added new syndicate computer board sprite. (space-wizards#34104) * Defined sprites for non-generic computer boards. Added new syndicate computer board sprite. * Added new sprite to meta.json and updated attribution. * Reformatted module.rsi meta.json to match other meta file styles. * Syndicate board sprite made less yellow/gold, changed outer chips to black. Using grey/silver for CPU centre, akin to syndie agent PDA theme, and to keep distinctive from security board. * Corrected indentation spacing for currently edited entities. * Update Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml * add pr link to attribution --------- Co-authored-by: slarticodefast <[email protected]> Co-authored-by: Errant <[email protected]> * Added pricegun sound (space-wizards#34119) added pricegun sound Co-authored-by: dylanhunter <[email protected]> * Automatic changelog update * Separate Tables n' Counters (space-wizards#32673) * Update tables.yml * Remove Extra base: state_ * Update tables.yml * Automatic changelog update * Add Chameleon PDA (space-wizards#30514) * V1 commit * Remove PDA name and unnecessary pda state * Adds PDA to Chameleon backpack & thief toolbox * Change to use AppearanceDataInit * Add basic PDA state to ensure there's always a sprite before AppearanceData can be applied * Revert PDA name (this will be changed to another way later) * Update PDA name updating to new system * Fix yaml, and fix Agent ID chameleon * Updated based on review * Automatic changelog update * Add some ion storm actions to replace removed ones (space-wizards#34180) * Add some ion storm actions to replace removed ones * Remove other country references, replace * Some more tuning of the storm values, removing real-world countries * boldy basics * Automatic changelog update * fix misc shit --------- Co-authored-by: Plykiya <[email protected]> Co-authored-by: PJBot <[email protected]> Co-authored-by: ActiveMammmoth <[email protected]> Co-authored-by: Thomas <[email protected]> Co-authored-by: keronshb <[email protected]> Co-authored-by: deltanedas <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: beck-thompson <[email protected]> Co-authored-by: Tayrtahn <[email protected]> Co-authored-by: Baa <[email protected]> Co-authored-by: sirionaut <[email protected]> Co-authored-by: Sirionaut <[email protected]> Co-authored-by: Preston Smith <[email protected]> Co-authored-by: slarticodefast <[email protected]> Co-authored-by: KieueCaprie <[email protected]> Co-authored-by: deathride58 <[email protected]> Co-authored-by: dragonryan06 <[email protected]> Co-authored-by: SlamBamActionman <[email protected]> Co-authored-by: Vexerot <[email protected]> Co-authored-by: Intoxicating-Innocence <[email protected]> Co-authored-by: Saphire <[email protected]> Co-authored-by: goet <[email protected]> Co-authored-by: Ed <[email protected]> Co-authored-by: ScarKy0 <[email protected]> Co-authored-by: Errant <[email protected]> Co-authored-by: chromiumboy <[email protected]> Co-authored-by: Southbridge <[email protected]> Co-authored-by: Patrik Caes-Sayrs <[email protected]> Co-authored-by: Tiniest Shark <[email protected]> Co-authored-by: Myra <[email protected]> Co-authored-by: psykana <[email protected]> Co-authored-by: Golinth <[email protected]> Co-authored-by: ArtisticRoomba <[email protected]> Co-authored-by: Spanky <[email protected]> Co-authored-by: lzk <[email protected]> Co-authored-by: Ty Ashley <[email protected]> Co-authored-by: Centronias <[email protected]> Co-authored-by: MilenVolf <[email protected]> Co-authored-by: RedBookcase <[email protected]> Co-authored-by: RedBookcase <[email protected]> Co-authored-by: Hannah Giovanna Dawson <[email protected]> Co-authored-by: Winkarst <[email protected]> Co-authored-by: Winkarst <[email protected]> Co-authored-by: Crotalus <[email protected]> Co-authored-by: TytosB <[email protected]> Co-authored-by: Emisse <[email protected]> Co-authored-by: SpaceLizard <[email protected]> Co-authored-by: LevitatingTree <[email protected]> Co-authored-by: August Sun <[email protected]> Co-authored-by: august-sun <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: IProduceWidgets <[email protected]> Co-authored-by: Piras314 <[email protected]> Co-authored-by: VideoKompany <[email protected]> Co-authored-by: CaptainMaru <[email protected]> Co-authored-by: AverageNotDoingAnythingEnjoyer <113719989+AverageNotDoingAnythingEnjoyer@users.noreply.github.com> Co-authored-by: pocl v <[email protected]> Co-authored-by: JustinWinningham <[email protected]> Co-authored-by: ElectroJr <[email protected]> Co-authored-by: Leon Friedrich <[email protected]> Co-authored-by: Pieter-Jan Briers <[email protected]> Co-authored-by: mubururu_ <[email protected]> Co-authored-by: amatwiedle <[email protected]> Co-authored-by: dankeaj <[email protected]> Co-authored-by: Booblesnoot42 <[email protected]> Co-authored-by: crazybrain23 <[email protected]> Co-authored-by: War Pigeon <[email protected]> Co-authored-by: Alpaccalypse <[email protected]> Co-authored-by: PursuitInAshes <[email protected]> Co-authored-by: zHonys <[email protected]> Co-authored-by: SolStar <[email protected]> Co-authored-by: Velcroboy <[email protected]> Co-authored-by: Velcroboy <[email protected]> Co-authored-by: Dylan Hunter Whittingham <[email protected]> Co-authored-by: dylanhunter <[email protected]> Co-authored-by: Spessmann <[email protected]> Co-authored-by: ~DreamlyJack~ <[email protected]> Co-authored-by: PopGamer46 <[email protected]> Co-authored-by: justdie12 <[email protected]> Co-authored-by: Nox <[email protected]> Co-authored-by: ReeZer2 <[email protected]> Co-authored-by: Alpaccalypse <[email protected]> Co-authored-by: Ps3Moira <[email protected]>
About the PR
Cluster grenades essentially have two categories.
I split it into two distinct systems to better separate the logic and fixed a few bugs.
Why / Balance
Technical details
Clustergrenades only trigger as a result of their on-use timer. This means that when they were destroyed, nothing happened. I gave both new categories of grenades a damage trigger so that they can be properly chained like regular explosives.
More than half of the variables in the system were unused by projectile-type grenades, so separating the two into two different systems enables easier alteration of logic or behavior.
None of the actual behavior regarding how they function has changed, it's just been separated.
Media
2024-05-30.21-50-33.mp4
2024-05-30.21-51-08.mp4
2024-06-19.12-25-36.mp4
Requirements
Breaking changes
ClusterGrenadeComponent/System were removed, replaced by ProjectileGrenadeComponent/System and ScatteringGrenadeComponent/System.
Changelog
🆑